Started to work on api layers. various utils etc...