Streamlined Code

Full functionality/pre redesign