Got more stuff working
Got a semi working version of counting done

Still needs some bugs fixed
Regular commit
Fixed some bugs
Merge with bugfix