another go at making a more better build