V1 :: Adds OOP section and cleans up some sections