Working Build 1.0.1B Incomplete

Issue with last commit - Fixed commit