Initial Commit
Clean up

plus some source