WIP: uncommented everything