Started implementing API [API is still being worked on] + Added some
functionality