Alpha working version
Resolving merge conflicts