Finished with build for now - more todo though