First commit, add currently available code. ADHOC for the win!