initial commit 2, more awesome code