Huge cleanup, work on ticking block functionality