Interface Overhaul 2

Signed-off-by: russkentish <russellkentish@gmail.com>