Annoying missing folders
Working code
some cleanup
More cleanup