Done with integrating System to Scene, needs testing though