fixed alignment; things still need hooked up correctly