Messy additions, sketching stuff out
Cleaning up