initial commit
test program stuff
resolving conflict albeit burte force ish