trying to get git working again
Merge origin/master
Cleaned up all files, removed unimplemented/unused functions