Initial Build, need to remove warnings