Reorganising things + some work on ticon stuff
adddditions