first pass at Admin and SQL, clean make