Working BUT messy
Cleanup from last commit