A whole bunch of stuff in progress, been forgetting to commit