Clearing up a little bit of logic/organization of code. Seems to be working well for user platform. Now on to software provisioning/deprovisioning

Signed-off-by: Raphael Lullis <raphael@lullis.net>
Software assignment working as well.

Signed-off-by: Raphael Lullis <raphael@lullis.net>