Updated code base

Entirely updated code base with tweaks to break points