Initial commit
Improved for code completion, some cleanup