updated build1, moved uncleaned up types to separate file