Major major update

but needs working on the Kamera class