working, just need better units