Initial work, partial build