Clean up and implement simple functions
Commited stupid evidence
merge