Apanzerj/current wip

lotsa work...