Slight internal modification
Started to re-implement features to scene module

WIP! Still lots of bugs!