Added footsteps, did some reorganizing and cleanup