Finished implementing levels, general import clean up