Finished item rotation handling
Code cleanup
Working on snap