Switched to js AMD, added requirejs part2