Monster commit to get mvp working
Remove old files