WIP - Lists not working properly
Clean up
Retrofitted Lists, cleaned up more things