Initial commit
Did some rearranging and cleanup