continued WIP

Need to move workspace into Dropbox to avoid these kinds of commits