More mechanics

Another mechanics update. Not perfect, but significantly closer.