This looks great! You could already make a test game out of it as it is!