Finalizing basic structure and objects, next step tests