Refresh project + added lazy loading
Another commit, cause something busted up