Full Commit

Updating repo for Nancon's scheduled work