First commit: A few unorganized work :)