Build working, starting on tests