Preliminary Build; works but not pretty