Cleaning up unnecessary stuff and adding some blocks to further work on