Initial Code Drop, needs serious clean up