pushing initial build, needs some cleanup