UPDATED: 12.7.2014
Working set, still need to fix some bugs.


Signed-off-by: Erik Hansen <mail.erik.hansen@gmail.com>

Change-Id: I335340a9c87c348c7b43845226b12f698a42299c