I'll finish this tonight, made a lot of progress