Code I've been working on the past week, many updates