Added some basic components to logic and tidied scene. Will merge to logic branch after this update.