Commit of stuff I did stay up all night doing