Integrating source added from other project
= made changes so it will compile
- removed stuff I'm not going to use