WIP: refactor builder components, rough edges still