I should start incremental commits, meh, maybe later