Re-Commiting #1

See Commit #1 Description minus misc. files