Initial Re-Commit. Working on verison 0.03.